Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Mon, 25 Jan 2010 17:42:44 +0000 (12:42 -0500)
committerEli Zaretskii <eliz@gnu.org>
Mon, 25 Jan 2010 17:42:44 +0000 (12:42 -0500)
commit50bacff95182f3a2adbaf30c440ca8fecb8b5473
treee7afcfbcd0a3a860d6b62488265716dd50df435c
parentdd75fc2fc70ddbbb89154ed2721973ca420ade77
parent0bbf36bbecaeb899f01eaa8326cc325a985a8d11
Merge from mainline.